[backport release-25.11] ci/pinned:update#482833
Merged
MattSturgeon merged 4 commits intoJan 23, 2026
Merged
Conversation
This gives us nixfmt 1.2.0. From the nixpkgs-unstable channel at revision bde0902. Changes for nixfmt (1.1.0 → 1.2.0): NixOS/nixfmt@v1.1.0...v1.2.0 Changes for nixd (2.7.0 → 2.8.2): nix-community/nixd@2.7.0...2.8.2 Changes for treefmt-nix: numtide/treefmt-nix@5b4ee75...e96d59d Changes for zizmor (1.20.0 → 1.21.0): zizmorcore/zizmor@v1.20.0...v1.21.0 ------- ci/nixf-diagnose: update configuration Update nixf-diagnose configuration as per numtide/treefmt-nix@0c445aa The new config output should be semantically equivalent. (cherry picked from commit d4b8a5b)
- avoid treewide cleanup due to these new rules - invalid nix code was getting auto fixed (cherry picked from commit cd60f55)
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between d8233b8 and original 28096cc may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
treewide: apply nixfmt 1.2.0
+ (cherry picked from commit 28096cc5e3d8334fbe1845925f000f8c8c5e0aac)
+
## doc/hooks/udevCheckHook.section.md ##
@@ doc/hooks/udevCheckHook.section.md: The hook runs in `installCheckPhase`, requiring `doInstallCheck` is enabled for
lib,
@@ lib/tests/checkAndMergeCompat.nix: in
## lib/tests/misc.nix ##
@@ lib/tests/misc.nix: runTests {
-
- testEscapeNixIdentifierNoQuote = {
- expr = strings.escapeNixIdentifier "foo";
-- expected = ''foo'';
-+ expected = "foo";
- };
-
- testEscapeNixIdentifierNumber = {
-@@ lib/tests/misc.nix: runTests {
sections = {
};
};
@@ lib/tests/misc.nix: runTests {
testToLuaEmptyBindings = {
## lib/types.nix ##
-@@ lib/types.nix: rec {
+@@ lib/types.nix: let
else if builtins.isBool v then
boolToString v
else
@@ nixos/doc/manual/shell.nix: let
+ buildArgs = "${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}";
open = "/${outputPath}/${indexPath}";
};
- nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" ''${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file '${toString ./redirects.json}' "$@"'';
+ nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@";
## nixos/lib/make-multi-disk-zfs-image.nix ##
@@ nixos/lib/make-multi-disk-zfs-image.nix: let
@@ nixos/modules/services/audio/pulseaudio.nix: let
in
- lib.optional (a != [ ]) ''auth-ip-acl=${lib.concatStringsSep ";" a}'';
+ lib.optional (a != [ ]) "auth-ip-acl=${lib.concatStringsSep ";" a}";
- port = lib.optional (!(isNull cfg.tcp.port)) "port=${toString cfg.tcp.port}";
in
pkgs.writeTextFile {
+ name = "default.pa";
## nixos/modules/services/backup/restic.nix ##
@@ nixos/modules/services/backup/restic.nix: in
@@ nixos/modules/services/backup/syncoid.nix: in
sshKey = lib.mkOption {
type = with lib.types; nullOr (coercedTo path toString str);
+ ## nixos/modules/services/blockchain/ethereum/geth.nix ##
+@@ nixos/modules/services/blockchain/ethereum/geth.nix: in
+ ${cfg.package}/bin/geth \
+ --nousb \
+ --ipcdisable \
+- ${lib.optionalString (cfg.network != null) ''--${cfg.network}''} \
++ ${lib.optionalString (cfg.network != null) "--${cfg.network}"} \
+ --syncmode ${cfg.syncmode} \
+ --gcmode ${cfg.gcmode} \
+ --port ${toString cfg.port} \
+ --maxpeers ${toString cfg.maxpeers} \
+- ${lib.optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \
++ ${lib.optionalString cfg.http.enable "--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}"} \
+ ${
+- lib.optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''
++ lib.optionalString (cfg.http.apis != null) "--http.api ${lib.concatStringsSep "," cfg.http.apis}"
+ } \
+- ${lib.optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \
++ ${lib.optionalString cfg.websocket.enable "--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}"} \
+ ${
+ lib.optionalString (
+ cfg.websocket.apis != null
+- ) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''
++ ) "--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}"
+ } \
+- ${lib.optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \
++ ${lib.optionalString cfg.metrics.enable "--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}"} \
+ --authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \
+ ${
+ if (cfg.authrpc.jwtsecret != "") then
+- ''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}''
++ "--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}"
+ else
+- ''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret''
++ "--authrpc.jwtsecret ${dataDir}/geth/jwtsecret"
+ } \
+ ${lib.escapeShellArgs cfg.extraArgs} \
+ --datadir ${dataDir}
+
## nixos/modules/services/blockchain/ethereum/lighthouse.nix ##
@@ nixos/modules/services/blockchain/ethereum/lighthouse.nix: in
--datadir ${cfg.beacon.dataDir}/${cfg.network} \
@@ nixos/modules/services/continuous-integration/buildbot/master.nix: in
};
- ## nixos/modules/services/continuous-integration/gitlab-runner/runner.nix ##
-@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
+ ## nixos/modules/services/continuous-integration/gitlab-runner.nix ##
+@@ nixos/modules/services/continuous-integration/gitlab-runner.nix: in
mapAttrsToList
(
name: serviceConfig:
@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
)
(
filterAttrs (
-@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
+@@ nixos/modules/services/continuous-integration/gitlab-runner.nix: in
mapAttrsToList
(
name: serviceConfig:
@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
)
(
filterAttrs (
-@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
+@@ nixos/modules/services/continuous-integration/gitlab-runner.nix: in
mapAttrsToList
(
name: v:
@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
)
(
filterAttrs (
-@@ nixos/modules/services/continuous-integration/gitlab-runner/runner.nix: in
+@@ nixos/modules/services/continuous-integration/gitlab-runner.nix: in
mapAttrsToList
(
name: v:
@@ nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix: in
];
RestrictAddressFamilies = [
- ## nixos/modules/services/network-filesystems/openafs/client.nix ##
-@@ nixos/modules/services/network-filesystems/openafs/client.nix: let
- sedExpr = '':x /^>\(${localCellsRegex}\) / { n; :y /^>/! { n; by }; bx }; p'';
- globalCommand =
- if cfg.cellServDB != { } then
-- ''sed -n -e ${lib.escapeShellArg sedExpr} ${cfg.globalCellServDBFile}''
-+ "sed -n -e ${lib.escapeShellArg sedExpr} ${cfg.globalCellServDBFile}"
- else
-- ''cat ${cfg.globalCellServDBFile}'';
-+ "cat ${cfg.globalCellServDBFile}";
- in
- pkgs.runCommand "CellServDB" { preferLocalBuild = true; } ''
-- ${lib.optionalString (cfg.globalCellServDBFile != null) ''${globalCommand} > $out''}
-+ ${lib.optionalString (cfg.globalCellServDBFile != null) "${globalCommand} > $out"}
- cat ${clientServDB} >> $out
- '';
-
-
## nixos/modules/services/networking/cloudflared.nix ##
@@ nixos/modules/services/networking/cloudflared.nix: in
};
@@ nixos/modules/services/web-apps/dokuwiki.nix: in
## nixos/modules/services/web-apps/freshrss.nix ##
@@ nixos/modules/services/web-apps/freshrss.nix: in
- let
- isUserAuth = cfg.authType == "form" || cfg.authType == "none";
+ script =
+ let
- userScriptArgs = ''--user ${cfg.defaultUser} ${
+ userScriptArgs = "--user ${cfg.defaultUser} ${
optionalString (cfg.authType == "form") ''--password "$(cat ${cfg.passwordFile})"''
- }'';
-- mkUserScript = name: optionalString isUserAuth ''./cli/${name}.php ${userScriptArgs}'';
+ }";
-+ mkUserScript = name: optionalString isUserAuth "./cli/${name}.php ${userScriptArgs}";
-
- updateUserScript = mkUserScript "update-user";
- createUserScript = mkUserScript "create-user";
+ updateUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") ''
+ ./cli/update-user.php ${userScriptArgs}
+ '';
## nixos/modules/services/web-apps/jitsi-meet.nix ##
@@ nixos/modules/services/web-apps/jitsi-meet.nix: in
@@ nixos/modules/virtualisation/containerd.nix: in
KillMode = "process";
Type = "notify";
- ## nixos/modules/virtualisation/guest-networking-options.nix ##
-@@ nixos/modules/virtualisation/guest-networking-options.nix: in
- virtualisation.vlans = lib.mkOption {
- type = types.listOf types.ints.unsigned;
- default = if cfg.interfaces == { } then [ 1 ] else [ ];
-- defaultText = lib.literalExpression ''if cfg.interfaces == {} then [ 1 ] else [ ]'';
-+ defaultText = lib.literalExpression "if cfg.interfaces == {} then [ 1 ] else [ ]";
- example = [
- 1
- 2
+ ## nixos/modules/virtualisation/incus.nix ##
+@@ nixos/modules/virtualisation/incus.nix: let
+
+ nvidiaEnabled = (lib.elem "nvidia" config.services.xserver.videoDrivers);
+
+- serverBinPath = ''/run/wrappers/bin:${pkgs.qemu_kvm}/libexec:${
++ serverBinPath = "/run/wrappers/bin:${pkgs.qemu_kvm}/libexec:${
+ lib.makeBinPath (
+ with pkgs;
+ [
+@@ nixos/modules/virtualisation/incus.nix: let
+ libnvidia-container
+ ]
+ )
+- }'';
++ }";
+
+ # https://github.com/lxc/incus/blob/cff35a29ee3d7a2af1f937cbb6cf23776941854b/internal/server/instance/drivers/driver_qemu.go#L123
+ OVMF2MB = pkgs.OVMF.override {
## nixos/modules/virtualisation/nixos-containers.nix ##
[...truncated...]Warning
Difference between ba56833 and original d99177a may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
.git-blame-ignore-revs: add nixfmt 1.2.0 commit
+ (cherry picked from commit d99177a3afe613af8a6796ab6eea9e746555ebb5)
+
## .git-blame-ignore-revs ##
@@ .git-blame-ignore-revs: c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt
# treewide: clean up 'meta = with' pattern
- 567e8dfd8eddc5468e6380fc563ab8a27422ab1d
+ cca3b04b44a5c57502fe2440cc3d2114779cc40c
+
+# nixfmt 1.2.0
-+28096cc5e3d8334fbe1845925f000f8c8c5e0aac # !autorebase nix-shell --run treefmt
++d8233b866ba074173b4ccc2182ae1508b8363c2d # !autorebase nix-shell --run treefmt
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
13 tasks
MattSturgeon
force-pushed
the
backport-480141-to-release-25.11
branch
from
958036e to
ba56833
Compare
nixpkgs-ci
Bot
added
10.rebuild-linux: 1-10
nixpkgs-ci
Bot
added
6.topic: php
nixpkgs-ci
Bot
added
the
8.has: documentation
Contributor
Author
|
Merging promptly to avoid getting out of sync. One fewer rebuild compared to master: Added packages (0)Removed packages (0)Changed packages (6)Version comparison report looks reasonable:
Evaluation time in seconds without downloading dependencies. cc @NixOS/nixpkgs-ci who wasn't pinged again, due to the large number of touched files. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Manual backport of #480141 due to conflicts
Things done